From: Joakim Verona <joakim@verona.se>
Date: Wed, 21 Aug 2013 06:33:57 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=194dcc0e82397275f6d560ba454774b88e96d929;p=emacs.git

merge from trunk
---

194dcc0e82397275f6d560ba454774b88e96d929